Fixed #4 and #2.