Merge branch 'master' of https://github.com/kruul/vova.git