Use common base class for all modules
Merge pull request #141 from mahagr/master

Use common base class for all modules