Code cleanup.
Merge pull request #76 from dixso/develop

Code cleanup.
Merge branch 'master' into gh-pages