Some small changes
Some fixes in sharing etc.
Merge pull request #61 from broggi/master

Some fixes in sharing