Closed issue #76 and #78