fixes for the cliche
Merge branch 'devel' of github.com:rabix/registry into devel