Fix indentation
Merge pull request #529 from gringocl/fix-indentation

Fix indentation
Merge branch 'master' into jby

* master:
  Fix indentation