brson Merge pull request #48 from barosl/rollup-fixes …