initial commit
Merge https://github.com/nezroy/EVEn