Base classes
Merge pull request #9 from chrismoulds/master

Base classes