Merging Dustin's fork to the Master under sldivine