Fixes #22 #52

Open shubhalgupta opened 1 year ago