Added some handy dingy
Merge remote-tracking branch 'origin/master' into PowerSystem