solving merging conflicts for #13 #49

Closed omarhisham closed 9 years ago