#34 Adding support of version 6.2.4