add support for tags
Merge remote-tracking branch 'origin/master'