working on #2
fixes #2
Merge branch 'topic2'