Support for Tags added
Merge branch 'devel'