use new API names
Merge branch 'master' of github.com:PhearTheCeal/VolaParrot