merge CrimsonJacket/master