Merge pull request #747 from lovmoen/master

Problem: Creating a new class involves writing a lot of boilerplate code.