:+1: merges ibnatiqbal:patch-6 closes #58