improve config
added tagging system
Merge branch 'tagging'