Added Support to CORE -566
Merge pull request #15 from saravanab/master

Added Support to CORE -566