Issue 303 merge

Merged @caitp issue-303 as I messed up the order to land in.