Merge pull request #2 from noamt/master

sync with upstream