Fixed #41, Fixed #47