Cleanup based on examination of public API (javadocs)
Merge pull request #33 from alxdarksage/develop

Cleanup based on examination of public API (javadocs)