Merge pull request #78 from leider/master

fixed more registration bugs