Merge pull request #168 from FlansMods/Development

Merge Development branch changes into master
Also update this file to 2.4
Merge pull request #169 from FlansMods/master

*sigh I've got to unlink these branches at some point