Commit 3aff3f822f0d7bf7a2b5160ad93df3fe413c7c47

Ebrahim Byagowi 2018-11-01T19:20:20

[feat] Apply @drott and @jfkthame comments