Use common mods
Merge pull request #153 from PilzAdam/common_mods

Use common mods