Cleanup
Merge pull request #14 from ekr/cj-screen-share1

Cleanup