Manually adding tags working
Merge branch 'master' into dev