Merge pull request #93 from raphinesse/cleanup

Cleanup