Klang added.
Merge pull request #1 from torstah/master

Klang added.