Created a class
Merge branch 'master' into experiment