improved parsing mechanism
fixed merge