Fixes issue #572
Resolved conflicts
Merge pull request #573 from clearsightstudio/bugfix/issue_572

Fixes issue #572