Updated to the latest version of Catel