diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0f021f52..cd995a17 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,10 +1,78 @@
-## Contributing
+# Contributing to NodeMCU
 
-Thank you everyone for contributing to this project.
+:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
 
-Pull requests for new features and major fixes should be opened against the `dev` branch.
+We're really glad you're reading this, because we need volunteer developers to help this project come to fruition.
 
-Avoid intermediate merge commits. Rebase your feature branch onto `dev` to pull updates and
-verify your local changes against them before placing the pull request.
+The following is a set of guidelines for contributing to NodeMCU on GitHub. These are just guidelines, not rules, use your best judgment and feel free to propose changes to this document in a pull request.
 
-*Note that the `pre_build` bin in the dev branch is never up-to-date.*
+#### Table Of Contents
+
+[Development environment setup](#development-environment-setup)
+
+[Working with Git and GitHub](#working-with-git-and-github)
+  * [Submitting Issues](#submitting-issues)
+  * [Your First Code Contribution](#your-first-code-contribution)
+  * [Pull Requests](#pull-requests)
+
+[Styleguides](#styleguides)
+  * [General flow](#general-flow)
+  * [Commit messages](#commit-messages)
+
+## Development environment setup
+Use the platform and tools you feel most comfortable with. There are  no constraints imposed by this project. You have (at least) two options to set up the toolchain to build the NodeMCU firmware:
+- [Full-fledged Linux enviroment](http://www.esp8266.com/wiki/doku.php?id=toolchain#how_to_setup_a_vm_to_host_your_toolchain), either physical or virtual.
+- [Docker image](https://hub.docker.com/r/marcelstoer/nodemcu-build/) which allows to run the build inside the container as if you were running a build script on your local machine.
+
+## Working with Git and GitHub
+
+*Pull requests for new features and major fixes should be opened against the `dev` branch.*
+
+Avoid intermediate merge commits. [Rebase](https://www.atlassian.com/git/tutorials/merging-vs-rebasing) your feature branch onto `dev` to pull updates and verify your local changes against them before placing the pull request.
+
+### General flow
+1. [Fork](https://help.github.com/articles/fork-a-repo) the NodeMCU repo on GitHub.
+1. [Create a branch](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/#creating-a-branch) in your fork on GitHub **based on the `dev` branch**.
+1. Clone the fork on your machine with `git clone https://github.com/<your-account>/<nodemcu-fork>.git`
+1. `cd <nodemcu-fork>` then run `git remote add upstream https://github.com/nodemcu/nodemcu-firmware.git`
+1. `git checkout <branch-name>`
+1. Make changes to the code base and commit them using e.g. `git commit -a -m 'Look ma, I did it'`
+1. When you're done:
+ 1. [Squash your commits](http://stackoverflow.com/q/5189560/131929) into one. There are several ways of doing this.
+ 1. Bring your fork up-to-date with the NodeMCU upstream repo ([see below](#keeping-your-fork-in-sync)). Then rebase your branch on `dev` running `git rebase dev`.
+1. `git push`
+1. [Create a pull request](https://help.github.com/articles/creating-a-pull-request/) (PR) on GitHub. 
+
+This is just one way of doing things. If you're proficient in Git matters you're free to choose your own. If you want to read more then the [GitHub chapter in the Git book](http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project#The-GitHub-Flow) is a way to start. [GitHub's own documenation](https://help.github.com/categories/collaborating/) contains a wealth of information as well.
+
+### Keeping your fork in sync
+You need to sync your fork with the NodeMCU upstream repository from time to time, latest before you rebase (see flow above).
+
+1. `git fetch upstream`
+1. `git checkout dev` but you may do this for `master` as well
+1. `git merge upstream/dev`
+
+### Commit messages
+
+From: [http://git-scm.com/book/ch5-2.html](http://git-scm.com/book/ch5-2.html)
+<pre>
+Short (50 chars or less) summary of changes
+
+More detailed explanatory text, if necessary.  Wrap it to about 72
+characters or so.  In some contexts, the first line is treated as the
+subject of an email and the rest of the text as the body.  The blank
+line separating the summary from the body is critical (unless you omit
+the body entirely); tools like rebase can get confused if you run the
+two together.
+
+Further paragraphs come after blank lines.
+
+ - Bullet points are okay, too
+
+ - Typically a hyphen or asterisk is used for the bullet, preceded by a
+   single space, with blank lines in between, but conventions vary here
+</pre>
+
+Don't forget to [reference affected issues](https://help.github.com/articles/closing-issues-via-commit-messages/) in the commit message to have them closed automatically on GitHub.
+
+[Amend](https://help.github.com/articles/changing-a-commit-message/) your commit messages if necessary to make sure what the world sees on GitHub is as expressive and meaningful as possible.
\ No newline at end of file