Merge pull request #18 from kud/master

Fix #17