First commit
Merge pull request #7 from kasunu/master

Fix for APPM-7