closes #514