closes #9 & #10