Picture This - fixed two shared data access bugs
Merge branch 'master' of ../stage