Merging with github.com/operatino/bestpractises