Make it compile with latest rustc
Merge pull request #67 from Vermeille/master

Make it compile with latest rustc