add guards
Fix entry.hh with values
Merge branch 'master' of https://github.com/Zanoellia/etablirond