issue/#434

fixes #434
Merge pull request #435 from hrajotia/develop

issue/#434