Electricitymeter

Merging electricitymeter to master branch.