this closes #37