Fixed minor issues
Merge pull request #108 from UAhmad7/master

Fixed minor issues