Merge pull request #32 from dylanerichards/master

presentation
pull from upstream