this closes #36