Closes #48