Cleanup
Merge pull request #21 from darylsew/master

Cleanup