first half milenko's comments
Merge pull request #125 from mshahriarinia/master

first half milenko's comments