Merge pull request #1 from barak/master