josecebe Modifications for version 1.4.2