Merge pull request #38 from birkenfeld/stable

Replace use of unstable features