Merge pull request #20 from i3mainz/copyedit_engelt

commit_1202_te
Commit_12_02_b_TE
Merge pull request #22 from i3mainz/master

merge from master to copyedit_engelt