updated to latest on MembershipReboot's github repo