Merges #443

Updated PR for #443.
Closes #443