Moves common methods to base class
Merge pull request #128 from nsendetzky/master

Moves common methods to base class