Worked on supporting CouchDB
Merge changes