Clients shouldnt do funny stuff anymore :D
Merge branch 'master' of https://github.com/Arclights/EDA031.git