Added class closes #8