Modified to compile with latest version of rust.
Merge pull request #3 from phillipw/pw_branch

Modified to compile with latest version of rust.