Merge pull request #6 from Sgt-Tailor/2.4

The 2.4 update
Merge remote-tracking branch 'refs/remotes/origin/master' into 2.4