fixing JAGGERY-395
Merge pull request #1 from supunmalinga/master

Fixing JAGGERY-395
Merge pull request #107 from wso2-dev/master

updates from wso2-dev fork