Fixing issue #346.
Fixes issue #347.
Fixing issue #348.
Fixing issue #345.
Fixing test.
updating bundle