Update with good changes from #463, closes #463