fix AttributeError (missing tag)
Merge branch 'labster/release' into labster/master