My first mods to faunus fork - Joao Henriques 20/08/2013