solved issue #18 and #20