* Adding ass load of changes for 1.0.31
* More rollup for 1.0.31