#Closes #40