Closes #200 & #202