hugs :)
Merge branch 'testing' of github.com:rfw/kochira into testing