Preserving state for code at the time of the writeup
Merge branches 'master' and 'code_for_paper'