Cleanup
Merge pull request #4 from k3xr/master

Cleanup
resolved conflict in merge