Fixed REGISTRY-1609
Merge pull request #7 from cnapagoda/master

Fixed REGISTRY-1609