Merge pull request #147 from evoskuil/version2

Comments and reorganization.