Somebugfix

Joaquim Jornet Somozarequested to merge
somebugfix into develop

Some minor changes to correct units and PUSH-POP statements.

Merge request reports