bug bix on handling paths
merge
Merge branch 'master' of https://github.com/celosc/energy