fixing issue #26
fixing issue #111
Merge pull request #113 from yoavgurevich/issue111

Issue #111 fixed
Merge pull request #110 from yoavgurevich/issue26

fixed issue #26
Fixed #7 - Deployment of MakeDrive client-side package