Merge pull request #454 from serpis/master

Fixes for changed rust features