Added support to CORE-433
Updated code pertaining to Jira Task Core-433
Merge pull request #59 from saravanab/master

Added support to CORE-433