Merge pull request #1131 from tiyowan/develop

Fix issue #64