this closes #33