closes #34 & #30