Pull request

Sorry for the mess, at the begining i did'd know how to use GIT that much..
there some very usefull changes...

bye!