Merge pull request #1 from akskinner/master

Does this work?