Language improvements.
Merge pull request #131 from faassen/patch-2

Language improvements.