merge
merge
Paper review
Merge pull request #134 from mshahriarinia/master

Paper review