Merge pull request #593 from lucidd/master

syntax changes to please new rustc and cargo