This resolves #33 and also resolves #32