Added class closes #1