thomaslee Merge pull request #2 from colinsurprenant/jflex161