nealrs Merge pull request #3 from everetm/master