Implements #710. Adding new unit tests.
Merge pull request #721 from emmanuel-keller/1.5

Implements #710. Adding new unit tests.