Fixed #7 and #8