Big thanks to @mansemino and @Fabi for the last commit :)

Signed-off-by: Kevin (Sgt Fatality) <kevainxxx@gmail.com>