Merge pull request #7 from andreasbovens/gh-pages

Couple of language tweaks
few more language fixes