Fixed #50
Fixed #46