some cleaning
Merge pull request #58 from dmichiels/master

some cleaning