Merge pull request #8 from andrewwillis/remove_deprecations