Issue #587 fixed
Merge pull request #588 from ijazfx/master

Issue #587 fixed