Fixed #6 and #8