Merge conflicts.
Modified find_organization function - should be more accurate but still improvements to be made.
Merge remote-tracking branch 'origin/master'