Minor corrections in disc and plotting
Merge remote-tracking branch 'origin/master'