Merge branch 'ningjing' of https://github.com/pinebud/angryfinger.git
into ningjing