Updated to pure 0.4.2