Merge pull request #22 from tokjun/master

Fixed issue #20 and #21.