list style
Merge branch 'jack'