Merge pull request #1 from rschurade/master

initial commit
Merge pull request #1 from katjaq/master

Merge pull request #1 from rschurade/master