closes #23