Merge pull request #18 from jvrdom/develop

Merge from develop
Merge pull request #20 from jvrdom/develop

Develop