Fix Issue #1044
Merge pull request #1045 from cfaddict/develop

Fix Issue #1044