Fix for #687
Merge pull request #688 from da-kid/master

Fix for #687