some fixes
Merge pull request #16 from baraabourghli/fixes

some fixes