Closes #50