Merge pull request #1 from hueniverse/master

Resync