Fix and test #247, #242
Fix and test #247, #242
minor changes
CS Fix
update UPGRADE.md
CS Fix
Merge pull request #272 from mpalourdio/Fix-#270

Fix and test #270, #242, #285