Merge pull request #3 from szw/master

Fix issue #1