Merge in branch user_disable. Issue #28