implemented findAll with limit, bugfix
merge