Merge pull request #4 from barak/upstream