Develop

Adapter pattern on branch develop