Edited revision
Merge branch 'master' of https://github.com/christos1984/elot