Cleanup
More Cleanup
Merge pull request #19 from msipe/master

More Cleanup