added feature 2
added feature 2
Merge branch 'jdfeature2' into develop