Merge pull request #1 from dfoss/develop

Develop
develop changes from harry
Merge branch 'develop' of https://github.com/dfoss/test into develop
featureX change from dick
another featureX change from dick
fixed merge