Fix #334
Merge pull request #335 from meman1188/master

Fix #334