updated
Merge branch 'v3' of ssh://github.com/hansliu/hansliu-theme into v3