Add admin and bugfix

resolves #49 , #56
Line is too long. [248/80]