Fix issue #7 and #8