Bug fixes for APPM-227
Merge pull request #64 from ruwany/master

Bug fixes for APPM-227