Fix of issue #528 with updated tests
Merge pull request #530 from yashmehrotra/develop

Fix of Issue #528