Add support for version 4
Added support for 4.6 Preview