Merge branch 'develop'
README build status link fixed
Merge branch 'master' into develop