Merge pull request #2 from synhershko/master

pull from Itamar's master.