gustafe/scrivener 3 commits