#13 bug fix
#73 improve test