dick commit on develop
harry commit item 2.
dick item 2
fix merge conflict
new item 3 from dick
Merge pull request #1 from dfoss/develop

Develop