Closes #25