Minor updates, improvements and fixes #58

Closed vahid-dan closed 1 year ago