Add vast support to the player
Merge branch 'master' into squares