resolve #506
Merge pull request #542 from TechFilmer/patch-9

resolve #506