Following the suggestion from #20
Following the suggestion from #20