replace mktime by time to prevent PHP error when E_STRICT is set
removing useless instructions
Merge branch 'master' into feat/config-path