Merge pull request #11 from barak/upstream

Upstream