Merge branch 'master' into interface
Merge branch 'master' into interface
Merge branch 'master' into interface
Including formatting of all outputs

Changed formatting for most functions and added formatting for task(s)
output.
Merge branch 'interface'