bug fixes
test fixes
Fixed issue where adapters other than the default are not loaded
0.3.1 release
Merge branch 'release/0.3.1'