Added support for PowerStrip naming.
bug fixes and updates
Merge branch 'devAPI' into API