minor fixes, no qrwa
Merge branch 'master' of github.com:piotrpachalko/hackaton-2014