cleanup
Merge pull request #86 from lolly/master

cleanup