Fixes

Fixed some issues here and there
Merge pull request #3 from gharehyazie/master

Fixes