Correct indentation and minor output change.
Revert previous as this is not default behavior.
First step towards a Lua implementation.