Merge pull request #2 from carso/master

love