Update to rust master
Update to rust master

Closes #34