Merge conflict resolution
Merge branch 'master' of https://github.com/DASISH/dwan-documentation
 taking and implementing the remarks of the others