fix friday
Merge branch 'master' of https://github.com/echr/pj