Closes #366
Closes #367
Changes to changelog