many fixes
Merge branch 'master' of https://github.com/5hassay/pyweek18
Merge branch 'master' of https://github.com/5hassay/pyweek18