Some changes to patterns
Merge branch 'master' of https://github.com/Lainism/dmp
Merge conflict solved