previous commit closes #31