Merge pull request #2 from carso/master

love
Merge pull request #3 from carso/Carso-Local

Merge pull request #2 from carso/master