closes #11