Fixed #13, Fixed #9