use tags rather than area
Merge branch 'develop'