closes #61