Merge pull request #21 from btricha/develop

Improvements to documentation, some code clean up, and a few bug fixes