Merge pull request #9 from oberstet/master

Fix Windows build, add build Makefile