Author update am Server, bugfix in Lib
Merge remote-tracking branch 'origin/master'