QA reopened the ticket.. working on #3
fixes #3 again
Merge branch 'topic3'