Fix the broken things.
Merge pull request #28 from johnb30/fixes

Fixing all the broken things.
Further work on docs.
Merge pull request #29 from johnb30/docs

Further work on docs.