Merge pull request #548 from hylent/master

fix issue #547