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