closes #11 for EricS