Merge branch 'refs/heads/master' into 2.4
Merge pull request #7 from Sgt-Tailor/2.4

Merge branch 2.4