resolve #11 #20

Closed ishaan-puniani closed 7 years ago