Issue #615 fixed
Merge pull request #616 from ijazfx/wonder

Issue #615 fixed