Cleanup for other pull request
Merge pull request #6 from mel0en/patch-2

Cleanup for other pull request