closes #16