diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..88bc97de4
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,75 @@
+# Snap Contributor Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers of Snap pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Snap maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Snap maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing Snap or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account such as Slack or Twitter, 
+or acting as an appointed representative at an online or offline event. 
+Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting Snap's team leads B.J. Ray bj.ray@intel.com and/or 
+Arek Chylinski arek.chylinski@intel.com. All complaints will be reviewed and 
+investigated and will result in a response that is deemed necessary and appropriate 
+to the circumstances. The project team is obligated to maintain confidentiality 
+with regard to the reporter of an incident. Further details of specific 
+enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
\ No newline at end of file
diff --git a/README.md b/README.md
index 6b8f47060..b6a019520 100644
--- a/README.md
+++ b/README.md
@@ -36,18 +36,19 @@ limitations under the License.
   * [Running Tasks](#running-tasks)
   * [Building Tasks](#building-tasks)
   * [Plugin Catalog](#plugin-catalog)
-2. [Documentation](#documentation)
+3. [Documentation](#documentation)
   * [Examples](#examples)
   * [Roadmap](#roadmap)
-3. [Community Support](#community-support)
-4. [Contributing](#contributing)
+4. [Community Support](#community-support)
+5. [Contributing](#contributing)
   * [Author a Plugin](#author-a-plugin)
-5. [Security Disclosure](#security-disclosure)
-6. [License](#license)
-7. [Contributors](#contributors)
+6. [Code of Conduct](#code-of-conduct)
+7. [Security Disclosure](#security-disclosure)
+8. [License](#license)
+9. [Contributors](#contributors)
   * [Initial Authors](#initial-authors)
   * [Maintainers](#maintainers)
-8. [Thank You](#thank-you)
+10. [Thank You](#thank-you)
 
 ## Overview
 
@@ -339,6 +340,9 @@ The power of Snap comes from its open architecture. Add to the ecosystem by buil
 * The definitive how-to is in [PLUGIN_AUTHORING.md](docs/PLUGIN_AUTHORING.md)
 * Recommendations to make effective, well-designed plugins are in [PLUGIN_BEST_PRACTICES.md](docs/PLUGIN_BEST_PRACTICES.md)
 
+## Code of Conduct
+All contributors to Snap are expected to be helpful and encouraging to all members of the community, treating everyone with a high level of professionalism and respect. See our [code of conduct](CODE_OF_CONDUCT.md) for more details.
+
 ## Security Disclosure
 
 The Snap team take security very seriously. If you have any issue regarding security, please notify us by sending an email to snap-security@intel.com