Made the code more generic
Merge branch 'master' of https://github.com/KoffKoff/LexGen