Update master to 0.5.7

@wesokes @wesleykendall