[ci skip] Add email address to doc blocks
Remove doc block comments behind parameter names again
Merge pull request #15 from timoschaefer/1.2

Merge branch '1.2'