closes #25
closes #24