Provided an example of a new class
Merge origin/master