Gemified
merge w/ latest master