Last fixes
Merge pull request #88 from Rotem12/master