Merge pull request #13 from jvrdom/develop

Merge from develop