Clean up code and add docstrings
Fix for Python 3.4
Updates for initial release