Merge pull request #3 from brandonhamilton/upstream