Merge pull request #4 from ebfe/fix-build

Fix test build
Fix build with rust master