fix for #8 and #9 plus fix in unit test
0.2.6