Merge pull request #2 from LuminousMonkey/master

Minor fixes to remove a warning, and fix last test.