[ENH] Integration of recent changes in ISTSmartOffice Project.
[ADD] Added Rodolfo Changes.