pulling changes from master to basic auth branch