ADD CLASS: issue #123