Support powerline
Merge branch 'powerline'