Updated for beta 7.
Merge pull request #75 from thelukester92/master

Update for beta 7.