[FIX] Consistent use of indentation

Consistent use of 4 spaces for indentation.
Merge branch 'indentation_fix' into hotfix-1.0.2