Merge pull request #2 from muchweb/docs

Documentation
Merge branch 'master' into docs