Fixed #57. Fixed #54. Fixed #50