Matthosu wanted it this way... So here it comes
Merge branch 'master' of github.com:PiotrSzymczyk/SO_2