Bug fix.
Merge pull request #36 from yanivgal/BugFix

Bug fix.