closes #515