Bug Fix.
Merge pull request #43 from yanivgal/BugFix

Bug Fix.