Fixed #49
Fixed #54
Fixed #55