Initial commit
Merge branch 'master' into develop
Initial work had been started on master before using git flow