Merge pull request #5 from silky/master

scott ritchie's talk