Fixed #54
Fixed #55