Merge branch 'master' of https://github.com/retuam/viva.git