closes #15
closes #15