develop changes from harry
Merge branch 'develop' of https://github.com/dfoss/test into develop