version 1.1
Merge pull request #1 from TobiasKarnat/master

version 1.1