daniel's commit
Merge pull request #2 from chendaniely/master

daniel's commit