clean-up
Merge pull request #98 from dildick/master

clean-up