updated to reflect Master and 0.7.x branches