Adding --limit to script
Merging postreleasefix/78 to master

* postreleasefix/78:
  Adding --limit to script