Object now stores copies of added lines to simplify memory managment.
Merge branch 'master' into haff-dev