Upgrade to RS 0.4.0