cleanup
Merge pull request #89 from lolly/master

cleanup