Added limit to the options

Allows you to limit the number of rows returned, defaults to 0 (which is
unlimited)
Merge branch 'master_single_file'

* master_single_file:
  Added limit to the options