closes #43
closes #45