Fixed #58
Fixed #54