Changed version to 2.4
Merge branch 'master' into beta