Minor cleanup
Merge pull request #37 from chandramouleswaran/v0.2-alpha

Minor cleanup