Changes to fix image sharing
Merge pull request #195 from unwin/develop-playing-catchup

Changes to fix image sharing