made autotag smarter
Merge branch 'develop'