clean-up
Merge remote-tracking branch 'origin/master'
Merge pull request #88 from dildick/master

clean-up