closes #32
closes #33