closed issue #7 and #30