Fixes #29
and add some notification about energy.

M