Update #519
Merge pull request #1085 from billyvg/master

Update #519