Fixed #4 and #5