jeff's patch applied. Resolves #1