New default value
Merge branch 'master' of github.com:mathias/remembrance
Simplify and extract