Fixed #56
Fixed #53