Fixed #20
Fixed #13