closes #36