Adapter factory.. Less code and all in one place! :D
Merge pull request #84 from herbatnik/master

Adapter factory.. Less code and all in one place! :D