Primera version
Merge branch 'master' of https://github.com/luimi/INN-EMP.git