Merge branch 'master' into dev/Ruben
Merge pull request #36 from rubenvanassche/dev/Ruben

Merge branch 'master' into dev/Ruben