Merge pull request #6 from rkophs/cleanup

Cleanup complete
Merge pull request #7 from rkophs/master

Merge pull request #6 from rkophs/cleanup