Adam/merge release to master