this closes #40