final brush up for initial release
Merge pull request #35 from rishy/develop

final brush up for initial release