this closes #18