unit tests passing
Merge branch 'register'