Merge pull request #7 from a1mueller/master

contact and links
Merge pull request #10 from a1mueller/lori

Merge pull request #7 from a1mueller/master