Closes #61