Merge pull request #22 from dmwm/master

Update repository.
Rollback pull 4172 since it breaks couch.
Merge pull request #4221 from HassenRiahi/RollbackPull4172

Rollback pull4172