Working on Isue #58 and fixed the power up bug