Fix Windows and Linux build
Merge pull request #11 from ericmj/master

Fix Windows and Linux build