Adding fixes for APPM-236
Merge pull request #68 from ruwany/master

Adding fixes for APPM-236