Update

it lives
Merge pull request #4 from ctf217/master

Update