Updated to fix conflicts with Salesforce1