Use findOne instead of find followed by nextObject
Merge branch 'sergeyksv-master'
updated history