Updated to latest master

Updated the library to compile with the latest rust compiler.