You should pull this one instead of gtmanfred's

Because it's his PR but with less fail and moar win :D