Closes #27