Added override behaviour
Merge branch 'master' of https://github.com/YAMJ/yamj-v3.git