Merge pr/451. Closes #451