fix for issue #17
spec tests for #17
Merge branch 'issues/17'