fixed #496
Merge pull request #521 from MarcBook/master

fixed #496