closes #42