Merge pull request #7 from a1mueller/master

contact and links