Added suggested code change and test to close issue #23.
Merge remote-tracking branch 'origin/master'

ssage aborts