working on #3
fixes #3
Merge branch 'topic3'