GIT-16 some hotfixes
Merge pull request #16 from PubMatic/GIT-16

Issue GIT-16 pull request to master