this closes #21