Master linux share display

This merges #34 into master and can be merged after that is merged.