Merge pull request #5 from kc-GitHub/master

Ah, ok. Habs selber gemerged.