Random language stuff, some comments etc
Merge pull request #1 from steffann/patch-1

Random language stuff, some comments etc