Merge pull request #35 from jvrdom/master

Merge from master.
Merge pull request #36 from jvrdom/jd-dev

Merge pull request #35 from jvrdom/master