Tweaking the xslt
Merge branch 'develop'