Updated to the latest version of jwrdegoede repo