Updated to latest version of Catel