Fix for issue#112, along with test case.
Merge branch 'master' into expectation
Savepoint...