Fixed #7 and #9.