closes #32
closes #31