Profit and Loss changes
Merge branch 'master' into Shane