Update for new rust changes
Merge pull request #17 from am0d/rust-master

Update for new rust changes