making everything on one click
Merge remote-tracking branch 'origin/master'