Merge pull request #251 from aplanas/master

Limit the number of lines to MAX_LINES