Merging updates from Constant Contact Repo