Added support for new lines and avoid use of "mkp."