:+1: merges timanib:patch-1 closes #63