Closed #21, fixed refresh token method