Resolved remaining issues #43

Closed omar-shaath closed 3 years ago