Merge pull request #1 from krakenjs/master

Catch up to master