Issue 24

https://github.com/SalesforceFoundation/Contacts_and_Organizations/issues/24