Merge pull request #1 from hillelcoren/master

Merge from Master