Little rework on the language!

It has been some time. But here it is! I think this is better. Good work as always. Keep it up.
Merge pull request #61 from agua2o/patch-9

Little rework on the language!