Debug paper
Merge branch 'code'