This fix #8.
New tests for issue #8.