Merge pull request #28 from i3mainz/master

merge from master to copyedit_engelt_13_02