Added some changes to tags
Merge remote-tracking branch 'origin/master'