Closes #47 (closed) didn't bother making a new branch since it made sense to this in the same branch as issue32.