Merge pull request #1 from Planetaryn/master

Test
Merge pull request #2 from Planetaryn/Shmuel

Merge pull request #1 from Planetaryn/master