closes #15
closes #16