Merge pull request #24 from jvrdom/develop

Merge from develop.