Added patches from wernerflamme, erial and geekspirit, thanks alot!!!

Please note this patches are not tested by myself yet, of course you are
welcome to test it