Merge pull request #8 from Areion/Kirsten

Kirsten
Merge remote-tracking branch 'origin/master' into Kirsten