closes #44
closes #37