Fix for latest rustc
Merge pull request #58 from canndrew/master

Fix for latest rustc