added life indicator
Merge branch 'master' into indicator
Merge branch 'indicator'