Added some docstrings and made some minor changes
Merge pull request #1 from ojh/master

Added some docstrings and made some minor changes