Merge pull request #1 from kripken/master

Update to latest