closes #58