closes #493