Hey,

- #96 - tests added, MR finalised and ready to merge

- #288 - feature ready, MR up for review; a few problematic tests remain to be solved

Thanks,
Avinash S.