Merge pull request #131 from evoskuil/develop

Comments and build flags.