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

clean-up