Merge pull request #1 from milanij/lex

Hi James
my first fucking change, yo
changes resolved
Merge pull request #2 from milanij/james

my first fucking change, yo
hi james more changes
fixed a JS error