Fixes for #44. Membership is now completly required.