Updates from IcyPhoenix and Enerdy.

Also added them as collaborators