Stubs.
Merge pull request #316 from mbebenita/refactoring

Stubs.