nojira
Merge pull request #27 from garethleonard/cleanup

nojira