Merge pull request #1 from GoDisco/master

update
Merge pull request #8 from AlmogBaku/master

Merge pull request #1 from GoDisco/master