Merge branch 'master' into develop
#10: Working on adding changelog generation to release tasks
Merge branch 'develop'