adds changes to release
Merge branch 'dev'