Fixed #5 and #6