added tests
modified test
passed test (#1)
Merge branch 'issue/1'

closes #1