Merge branch 'master' of https://github.com/visierrat/cop6727.git