Language improvements
Merge pull request #17 from Sobak/patch-1

Language improvements