Closes #207 and #202.