Update Iss14

Issue #14 branch requires update from Master.