Initial commit.
Updated readme and tested rebuild from scratch.
Merge branch 'develop'
Merge remote-tracking branch 'origin/master' into develop
Merge branch 'develop'