Fix issue #91
Update unit test