Merge branch 'master' of https://github.com/pkipping/VisTab-phone.git