Merge pull request #38 from evoskuil/develop

Comments and Windows build stuff