- closes #13
- closes #11
- closes #9