Issue #92,added tests