Issues #57 and #59 cause Spencer said today

Closes #57 (closed) and #59 (closed)

Please fill in the appropriate checklist below (delete whatever is not relevant). These are the most common things requested on pull requests (PRs).

PR checklist

• This comment contains a description of changes (with reason)
• Documentation in docs is updated
• CHANGELOG.md is updated