Some cleaning
Merge pull request #225 from Winnetou/patch-25

Some cleaning