Merge pull request #9 from madusankap/master

please pull
created to multitenants availability
created to multitenants availability
Merge pull request #20 from tharindu1st/master

please pull