Merge pull request #50 from svx/master

Cleaning