Add --max-frames option
Add --eof-exit switch
Merge pull request #1072 from CyberShadow/pull-20141001-131543

Add --eof-exit and --max-frames