Line wrapping & excution fixed

#340