Fix style issues and green test suite.
Merge pull request #28 from jjlangholtz/jjl

Fix style issues and green test suite.