Closes #43