Merge branch 'master' into jd-dev
Merge pull request #7 from jvrdom/jd-dev

Merge branch 'master' into jd-dev