Merge pull request #35 from lentillog/feature/vita