Merge pull request #11 from scollis/master

Merge pull request #10 from scollis/pres