closes #55; closes #54