[#1875] Machaba/Faris | Added ability.
Merge pull request #565 from farismosman/master

[#1875] Machaba/Faris | Added ability.