Fixed #44, Fixed #45, Fixed #46