Real Marks

Issue #259 raises the issue that marks do not track the changes in the document. This PR addresses this issue.