First clean-up
Merge pull request #3 from umcsdon/master

First clean-up