Merge pull request #58 from dmichiels/master

some cleaning
Merge remote-tracking branch 'refs/remotes/upstream/master'