closes #372