Updated to 0.6.20