Seans contribution
Merge pull request #1 from davidchang/seans-branch

Seans contribution