Small code changed as proposed in #128. This should close #128. Slowly moving towards Camel-case in script output.