expression structure change - expr to $expr
Merge branch 'devel' of github.com:rabix/registry into devel