#411 (closed)
NOTE: IMO after this MR is merged , issue #315 will be fully finished. Please take a look, and let me know if we need to add something else @mcfarhat