optimisation #3
Merge branch 'master' of github.com:jscrane/PET-Energia