Merge branch 'master' of https://github.com/joelauliet/DEV1