Merge pull request #29 from teknico/shorten-lines