Code cleanification
[Generating dist files]
Merge pull request #14 from Evaneos/quick-fixes

Quick fixes