Merge pull request #201 from brett-walker/master

 Patch the test code to be cross-platform.