updated to 2.4.0.Final version (this is the second commit for this as the first was broken)