added some cool things
while...just a mess ..
Merge remote-tracking branch 'origin/master'