Updated life.
Added settiomeout to life
Merge remote-tracking branch 'origin/master'