closes #84