bug 105 fix
Merge branch 'bugfix_105' of github.com:mindpin/eshare