closes #54
closes #55