Merge branch 'docs/improve-docs' into 'master'

Restructure and add more details to documentation

See merge request !37