Cleanup
Merge pull request #29 from psafx/jellybean

Cleanup