Fixing REGISTRY-2268
Merge pull request #12 from erandasooriyabandara/master

Fixing REGISTRY-2268