bugfix1-description
bugfix2-description
Merge pull request #1 from Yaakov-Belch/yb_bugfix1

bugfix1-description ok!