Merge branches 'master' and 'buffer'
Merge pull request #3 from rgibson518/master

Merge branches 'master' and 'buffer'