Cleanup
Merge pull request #19 from madevr/master

Cleanup