Closes #63