Random cleanups and bug fixes.
Add author property.
Merge pull request #159 from dstegelman/feature/code_cleanup

Code Cleanup and Fixes