* fix issue #18

add fix& tests
* rebuild lib with CS 1.7.1