Too much stress!
Merge pull request #14 from LukasGalliker/master

Too much stress!