diff --git a/.gitignore b/.gitignore
index 75be4c5f7..162b9c4d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ test_app/.embark/development/
 test_app/config/production/password
 test_app/node_modules/
 test_app/chains.json
+.idea
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..0af795717
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,92 @@
+# Contributing
+
+When contributing to this repository, please first discuss the change you wish to make via issue,
+email, or any other method with the owners of this repository before making a change.
+
+Please note we have a code of conduct, please follow it in all your interactions with the project.
+
+## Pull Request Process
+
+1. Ensure any install or build dependencies are removed before the end of the layer when doing a
+   build.
+2. Update the README.md with details of changes to the interface, this includes new environment
+   variables, exposed ports, useful file locations and container parameters.
+3. Increase the version numbers in any examples files and the README.md to the new version that this
+   Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
+4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
+   do not have permission to do that, you may request the second reviewer to merge it for you.
+
+## Code of Conduct
+
+### Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers 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
+
+Project 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.
+
+Project 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 the project 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, 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 the project team at [INSERT EMAIL ADDRESS]. 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 ac3cab766..6e2edae7f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-[![Join the chat at https://gitter.im/iurimatias/embark-framework](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iurimatias/embark-framework?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![npm](https://img.shields.io/npm/dm/embark.svg)]()
+[![Gitter](https://img.shields.io/gitter/room/iurimatias/embark-framework.svg)]()
 [![Build
 Status](https://travis-ci.org/iurimatias/embark-framework.svg?branch=develop)](https://travis-ci.org/iurimatias/embark-framework)
 [![Code Climate](https://codeclimate.com/github/iurimatias/embark-framework/badges/gpa.svg)](https://codeclimate.com/github/iurimatias/embark-framework)
diff --git a/boilerplate/app/index.html b/boilerplate/app/index.html
index 3585f0803..8068e7c7b 100644
--- a/boilerplate/app/index.html
+++ b/boilerplate/app/index.html
@@ -6,6 +6,6 @@
   </head>
   <body>
     <h3>Welcome to Embark!</h3>
-    <p>See the <a href="https://github.com/iurimatias/embark-framework/wiki">Wiki</a> to see what you can do with Embark!</p>
+    <p>See the <a href="http://embark.readthedocs.io/en/latest/index.html" target="_blank">Embark's documentation</a> to see what you can do with Embark!</p>
   </body>
 </html>
diff --git a/lib/core/services.js b/lib/core/services.js
index a04f672eb..6d4cce518 100644
--- a/lib/core/services.js
+++ b/lib/core/services.js
@@ -20,6 +20,7 @@ ServicesMonitor.prototype.startMonitor = function() {
 };
 
 ServicesMonitor.prototype.stopMonitor = function() {
+  clearInterval(this.monitor);
 };
 
 ServicesMonitor.prototype.check = function() {
@@ -70,18 +71,23 @@ ServicesMonitor.prototype.check = function() {
                body += d;
            });
            res.on('end', function() {
-               var parsed = JSON.parse(body);
-               if(parsed.Version){
-                 result.push(("IPFS " + parsed.Version).green);
+               try{
+                 var parsed = JSON.parse(body);
+                 if(parsed.Version){
+                   result.push(("IPFS " + parsed.Version).green);
+                 }
+                 else{
+                   result.push("IPFS".green);
+                 }
                }
-               else{
-                 result.push("IPFS".green);
+               catch (e){
+                 result.push("IPFS".red);
                }
                callback(null, result);
            });
            res.on('error', function(err) {
             self.logger.trace("Check IPFS version error: " + err);
-            result.push("IPFS".green);
+            result.push("IPFS".red);
             callback(null, result);
            });
          });