Fixed #559
Merge pull request #560 from monster860/master

Fixed #559