clean up and add documentation
Merge branch 'add_ldap_support'