Merge pull request #135 from leider/master

Neue Impl von server side validation
Merge pull request #137 from leider/master

Small Fix
Merge remote-tracking branch 'upstream/master'
more oopsi