pull recent commits from michaeljb