Fixed issue #6 and #6.