Merge

xDDD Fixed EnergyNet(not tested