cleaning for release
Merge pull request #18 from panique/develop

cleaning for release