closes #39
closes #42