....
Merge branch 'master' of https://github.com/l4chong/lightning