Commit a157b3e4ebd57ad29f217c4cef6519e7398cfa5c

Ebrahim Byagowi 2018-11-01T19:56:16

[feat] Apply @behdad comments