Fix #431
Merge pull request #434 from godu/master

Fix