Few minor tweaks
Merge pull request #1 from AriaMinaei/master

Few minor tweaks