Closes #62 and possibly #47

Closes