Merge pull request #2 from Dogfalo/master

Merging.