This is now Master.. some changes... alot better^^