Closes #40