Merge pull request #6 from rkophs/cleanup

Cleanup complete