More fine tuning
Merge pull request #127 from mshahriarinia/master

More fine tuning