updating cs10 branch from jmoenig 0614