fix for SS-287
Merge pull request #37 from bhathiya/master

fix for SS-287
Merge pull request #7 from wso2-dev/master

sucessfully commited the changes
Timestamp : Wed Nov 12 14:07:48 IST 2014
https://wso2.org/jenkins-pr-builder/job/product-ss/129/