Picture and simple_plot function
More paper changes
Merge remote-tracking branch 'origin/master'