Merge pull request #3 from stiers/master