My first ENER commit
Merge branch 'master' of github.com:Anton87/ENER