Updated user model. New models, updated copyright
#38
Fixed #43