jimblom Merge pull request #4 from stevenjswanson/master