Library cleanup
FIX #5

Allow login with token