Bug Fix #519
Merge pull request #679 from aRn0D/fix-519

Bug Fix #519