#36 Adding support of version 6.3.0