Issue #95 changes to correct branch