Merge pull request #4 from bcaffo/master

Merging brown talk