move test of power
Merge remote-tracking branch 'origin/master'

Conflicts:
	ec.cpp