Cleanup
Merge pull request #64 from camael24/b/cleanup

Cleanup