conflict
Merge branch 'master' of https://github.com/xpush/node-xpush
issue#16 is find -> findOne