Closes #64