- closed issue #6 and #3