Results 5 comments of Dysta

> @Dysta would you mind if I clean up the history on this pr a bit? you can, the history came bc I rebase the branch with the current master