+ store on server && fixes #3