this closes #17