Merge pull request #1 from aquynh/next

Updating 'next'