Merge pull request #38 from jvrdom/jd-dev

Merge from Jd-dev