Changed the way tags allowances are handled
Merge remote-tracking branch 'origin/master'