Docs update
Merge pull request #403 from psav/docs_update

Moved docs into right place