Merge pull request #20 from sparkica/master

Cleaning....