Closes #14 & #15