#2
merged changes from head
cleaned up a bit
cleaned up a bit
indentation only
#2
#2 Show that adapter is indeed registered.
Merged #2