Small fixes
Merge branch 'master' of github.com:kAworu/tagutil
Avoid using implementation reserved namespace __ and _