A my github info
Fixed merge conflicts with Phoenixs changes
Fixed more merge conflicts
Fixed again :)