Enhanced the Authentication, closes #76