Initial commit
Merge
Merge https://github.com/vojtechjurasek/ELP