closes #12
closes #13