Jc/issue635

Addresses issue 635 and 709.