Update for rust 0.11
Merge pull request #1 from tomshen/master

Update for rust 0.11