Merge pull request #7 from njcrawford/master

Fix Windows compile issue caused by 4fd65af