Merge Update

develop into master
Merge branch 'develop'

update master to a stable init set up
Config data update
Merge pull request #2 from simondavies/master

Merging Develop to Master