Small docs fix
Another small fix
Moved template to right filename
Merge pull request #998 from psav/fix_docs

Small docs fix
Merge pull request #999 from psav/fox_docs2

Another small fix
Merge pull request #1000 from psav/fix_template

Moved template to right filename