Merge pull request #504 from orenmazor/master