Merge branch 'master' of github.com:Fippe94/openEtG