Merge pull request #36 from jvrdom/jd-dev

Merge pull request #35 from jvrdom/master
Merge pull request #37 from jvrdom/jd-dev

Merge from jd-dev