Merge pull request #1 from Dogfalo/master

Merged latest changes from the main repository