Version 4.1.0 of the class, several fixes