closes #960

This is for Sprint 41