Merged branch power meter into master