Butify the code
Merge remote-tracking branch 'share/master'