cleanup
Merge pull request #1 from dforsyth/master

cleanup