Code Optimierung
Fixed #11, Avatar support