final version 1.6
Merge pull request #6 from TobiasKarnat/master

final version 1.6