closes #11
closes #4