Changes to make things work.
Merge pull request #31 from johnb30/cleanup

Changes to make things work.