Yaron's test fix
Merge pull request #26 from ivanjudson/master

Yaron's test fix