Merge pull request #1 from atsampson/master