closes #482