v 1.2

Registration added... semi functional...
merge pr3 to master