Merge branch 'master' of http://git.hands.com/zavai