merge from dmcclung-master