Fixed #55 Fixed #54 Fixed #53