this closes #15 and closes #13
this closes #15 and closes #13