Merge branch 'master' of /home/pl/chr