Merge pull request #57 from OmgImAlexis/lex

Oops
Merge pull request #58 from OmgImAlexis/lex

What??