Implemented issue #1

Also refactord code and added "name" for member and user