added a feature
Merge branch 'jdfeature' into develop