Snicolas/issue 215

Should be merged ASAP
nw, this doc is really mainstream ;)