Adding fix for APPM-237
Merge pull request #67 from ruwany/master

Adding fix for APPM-237
Merge remote-tracking branch 'upstream/master'