Clean up
Merge pull request #8 from chandramouleswaran/v0.2-alpha

Clean up