resolved conflicts to pullrequest #442

I sent this pullrequest to facilitate understanding of the changes in pullrequest #442