Misc Cleanup
Merge pull request #23 from sbhandari/master

Misc Cleanup