As suggested in #52
Original auth mechanism introduced in #27
This change should retain backwards compability