Fixed #6 and #7