Merge pull request #1 from pikesley/master

Prawnball
Merge pull request #1 from mrchrisadams/master

Upstream changes