Fixed a bug with registration
Merge branch 'master' of github.com:yfidolphin/yfi