Cleanup and update
Merge pull request #4 from matjack1/master

Cleanup and update