Changed some powerline stuff
Merged master