REGISTRY-2275
Merge pull request #16 from isuruwan/master

REGISTRY-2275