Closes #69