Fixes #21
Merge pull request #22 from couchbaselabs/issue-21

Fixes #21
Resolved merge conflicts