Add baseclass
merge in master
Merge pull request #284 from rmcgibbo/baseclass

Add baseclass
merge master