Some cleaning
Merge pull request #35 from Winnetou/patch-1

Some cleaning