Bug; #28 Fixed indentation issues.
Merge branch 'f28-indentation' into devel