Merge pull request #3 from jeldo/master

new master clean
Merge pull request #4 from jeldo/master_clean

Merge pull request #3 from jeldo/master