Issue353b

Replace the branch issue353 as it had commits for issue356 as well.

This addresses issue #353.