Updated code to work with latest rust master
Merge pull request #6 from hjr3/lang-updates

Updated code to work with latest rust master