fix for issue #7
addressing issue #9
Merge branch 'issues/9'