Add Set class and tests
Merge branch 'develop'