Merge pull request #31 from erickt/master