Merging in the latest from the original gem