Cleanup
Performance fixes
Merge pull request #35 from chandramouleswaran/v0.2-alpha

Perf fixes