Fixed #6 and #5