Fixed life and shield
Merge pull request #3 from dsavineau/master

Fixed life and shield