Merge pull request #3 from omsmith/master