Update for latest Rust and fixed up id for Linux
Merge pull request #97 from Arcterus/master

Update for latest Rust and fixed up id for Linux