Fixed #28
Added more tests