cancel code fix
Merge branch 'master' of https://github.com/brockallen/BrockAllen.MembershipReboot