Standardise

Merged André Anjos requested to merge standardise into master

Also closes #1 (closed).

Merge request reports