Fix for issue #108; a little cleanup.
Merge branch 'release/2.3.1'