fixed many thing and super cleaned code!
Merge remote-tracking branch 'origin/master'