tags are added and working
tags-related code is a bit refactored
Merge pull request #9 from Konviser/master

OK :)