Closes #31