Fixed the issue #19 and #20