closes #267