Merge pull request #1 from MiddelkoopT/master

new master upstream
Merge pull request #1 from mtim/master

Merge pull request #1 from MiddelkoopT/master