Alright, i will get right on that :p

EDIT: Updated and awaiting approval :P [@Leoven]