Minor fixes
Merge pull request #132 from mshahriarinia/master

Minor fixes