Closes #35 Closes #36