Closed issue #20 and issue #26