closes #40