bugfixing
Merge branch 'master' into detecttag