Merge branch 'pr-349' into 2.0

Closes #299 and #349