Merge branch 'master' into develop
refs #33
Merge branch 'develop'